Skip to content

LCORE-1642: Branching model#1928

Merged
tisnik merged 1 commit into
lightspeed-core:mainfrom
tisnik:lcore-1642-branching-model
Jun 15, 2026
Merged

LCORE-1642: Branching model#1928
tisnik merged 1 commit into
lightspeed-core:mainfrom
tisnik:lcore-1642-branching-model

Conversation

@tisnik

@tisnik tisnik commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

Description

LCORE-1642: Branching model

Type of change

  • Refactor
  • New feature
  • Bug fix
  • CVE fix
  • Optimization
  • Documentation Update
  • Configuration Update
  • Bump-up service version
  • Bump-up dependent library
  • Bump-up library or tool used for development (does not change the final image)
  • CI configuration change
  • Konflux configuration change
  • Unit tests improvement
  • Integration tests improvement
  • End to end tests improvement
  • Benchmarks improvement

Tools used to create PR

  • Assisted-by: N/A
  • Generated by: N/A

Related Tickets & Documents

  • Related Issue #LCORE-1642

Summary by CodeRabbit

  • Documentation
    • Comprehensive branching documentation now available, covering Git workflow conventions, release branch management, semantic versioning standards, branch naming conventions, and best practices.
    • Visual branching diagrams included illustrating feature merges, cherry-pick workflows, and multi-branch scenarios.
    • Documentation navigation updated to include the new branching reference guide.

@coderabbitai

coderabbitai Bot commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

Warning

Review limit reached

@tisnik, we couldn't start this review because you've reached your PR review rate limit.

More reviews will be available in 51 minutes and 31 seconds. Learn how PR review limits work.

Your organization has used up its prepaid credits, and credit purchases are no longer available. Enable the review add-on in the billing tab to keep reviews running — you're only billed for reviews past your plan's rate limits ($0.25/file).

⌛ How to resolve this issue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans include higher PR review limits than trial, open-source, and free plans. In all cases, reviews become available again over time. During sustained high-volume PR review activity, CodeRabbit may temporarily slow when the next review becomes available.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: 93ec9e12-0fb5-4506-9702-1fd100f25d91

📥 Commits

Reviewing files that changed from the base of the PR and between 5e676ac and f29e7ce.

⛔ Files ignored due to path filters (3)
  • docs/branching_1.svg is excluded by !**/*.svg
  • docs/branching_2.svg is excluded by !**/*.svg
  • docs/branching_3.svg is excluded by !**/*.svg
📒 Files selected for processing (3)
  • docs/README.md
  • docs/branching.md
  • docs/index.md

Walkthrough

A new docs/branching.md file is added describing the Lightspeed Core Stack Git workflow, covering branching rules, release branch details, semantic versioning, naming conventions, and three external branching diagrams. Links to this page are added in docs/README.md and docs/index.md.

Changes

Branching Documentation

Layer / File(s) Summary
New branching guide
docs/branching.md
Adds the full branching guide with TOC, introduction and basic rules, release branch key points, semantic versioning rules, branch naming conventions table, and links to three external branching visualizations.
Navigation entries
docs/README.md, docs/index.md
Adds a "Branching" link under the Releasing section in both the README index and the site navigation file.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~5 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title 'LCORE-1642: Branching model' directly and clearly describes the main change—adding documentation for the branching model with new files (docs/branching.md) and index updates.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
✨ Simplify code
  • Create PR with simplified code

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 5

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@docs/branching.md`:
- Around line 72-74: The fenced code block containing the release branch naming
pattern (release/MAJOR.MINOR.PATCH) is missing a language specification for
syntax highlighting. Add a language identifier to the opening triple backticks
of this code block by changing the opening ``` to ```text to enable proper
syntax highlighting in the documentation.
- Around line 90-91: In the docs/branching.md file, change the single-word form
"bugfixes" to the two-word form "bug fixes" for consistency with standard
English and the rest of the document. Locate the phrase "final bugfixes" in the
list of typical tasks on the branch and update it to read "final bug fixes".
- Line 155: The section heading "Cherry picking changes into release (stable)
branch from the main branch" uses "Cherry picking" without a hyphen, but when
used as a gerund modifying a noun phrase, it should be hyphenated for
grammatical correctness. Change "Cherry picking" to "Cherry-picking" in the
heading.
- Around line 145-146: The NOTE statement uses awkward phrasing with "not
feature nor hotfix ones" which is unclear. Reword the sentence to make it
clearer that the proposal specifically focuses on release branches only, by
replacing the awkward negative construction with a more direct positive
statement that emphasizes the proposal's scope is limited to release branches.
- Around line 111-115: The three SemVer rules in the list starting with MAJOR,
MINOR, and PATCH all begin with the same word "Increment," creating repetitive
sentence structure. Restructure these three bullet points to vary the phrasing
while preserving the meaning. Consider rephrasing at least one or two of the
rules to start with different verbs or sentence structures instead of beginning
each with "Increment" (for example, use passive voice, different action verbs,
or reorganize the grammatical structure) to improve readability and flow.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro

Run ID: 75e6e4fd-b1e6-43de-b0da-156a5972dfa2

📥 Commits

Reviewing files that changed from the base of the PR and between 750ff7f and 5e676ac.

⛔ Files ignored due to path filters (3)
  • docs/branching_1.svg is excluded by !**/*.svg
  • docs/branching_2.svg is excluded by !**/*.svg
  • docs/branching_3.svg is excluded by !**/*.svg
📒 Files selected for processing (3)
  • docs/README.md
  • docs/branching.md
  • docs/index.md
📜 Review details
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (19)
  • GitHub Check: bandit
  • GitHub Check: unit_tests (3.12)
  • GitHub Check: unit_tests (3.13)
  • GitHub Check: radon
  • GitHub Check: Pylinter
  • GitHub Check: mypy
  • GitHub Check: integration_tests (3.12)
  • GitHub Check: integration_tests (3.13)
  • GitHub Check: build-pr
  • GitHub Check: spectral
  • GitHub Check: E2E: server mode / ci / group 1
  • GitHub Check: E2E Tests for Lightspeed Evaluation job
  • GitHub Check: E2E: library mode / ci / group 1
  • GitHub Check: E2E: server mode / ci / group 2
  • GitHub Check: E2E: library mode / ci / group 2
  • GitHub Check: E2E: library mode / ci / group 3
  • GitHub Check: E2E: server mode / ci / group 3
  • GitHub Check: Konflux kflux-prd-rh02 / lightspeed-stack-0-6-on-pull-request
  • GitHub Check: Konflux kflux-prd-rh02 / lightspeed-stack-on-pull-request
🧰 Additional context used
🪛 LanguageTool
docs/branching.md

[grammar] ~90-~90: Ensure spelling is correct
Context: .... * Typical tasks on the branch: final bugfixes, documentation, version bump, packagi...

(QB_NEW_EN_ORTHOGRAPHY_ERROR_IDS_1)


[style] ~115-~115: Three successive sentences begin with the same word. Consider rewording the sentence or use a thesaurus to find a synonym.
Context: ...ty in a backwards-compatible manner. * Increment PATCH when you make backwards-compatibl...

(ENGLISH_WORD_REPEAT_BEGINNING_RULE)


[grammar] ~145-~145: Ensure spelling is correct
Context: ...vers just release branches, not feature nor hotfix ones. ## Branching visualizati...

(QB_NEW_EN_ORTHOGRAPHY_ERROR_IDS_1)


[grammar] ~155-~155: Use a hyphen to join words.
Context: ...speed-stack/branching_1.svg) ### Cherry picking changes into release (stable) br...

(QB_NEW_EN_HYPHEN)

🪛 markdownlint-cli2 (0.22.1)
docs/branching.md

[warning] 72-72: Fenced code blocks should have a language specified

(MD040, fenced-code-language)

🔇 Additional comments (2)
docs/README.md (1)

80-82: LGTM!

docs/index.md (1)

89-91: LGTM!

Comment thread docs/branching.md Outdated
Comment thread docs/branching.md Outdated
Comment thread docs/branching.md Outdated
Comment on lines +111 to +115
* Increment MAJOR when you make incompatible API changes.

* Increment MINOR when you add functionality in a backwards-compatible manner.

* Increment PATCH when you make backwards-compatible bug fixes.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick | 🔵 Trivial | 💤 Low value

Reduce repetition in the SemVer rules list.

All three rules start with "Increment," which makes the list feel repetitive. Consider restructuring for better readability:

✓ Proposed alternative
-* Increment MAJOR when you make incompatible API changes.
+* MAJOR: incompatible API changes.

-* Increment MINOR when you add functionality in a backwards-compatible manner.
+* MINOR: backwards-compatible feature additions.

-* Increment PATCH when you make backwards-compatible bug fixes.
+* PATCH: backwards-compatible bug fixes.

Or keep the current form but rephrase one or two to vary the sentence structure:

-* Increment MAJOR when you make incompatible API changes.
+* Increment MAJOR for incompatible API changes.

-* Increment MINOR when you add functionality in a backwards-compatible manner.
+* Increment MINOR when you add backwards-compatible features.

-* Increment PATCH when you make backwards-compatible bug fixes.
+* Increment PATCH for backwards-compatible bug fixes.
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
* Increment MAJOR when you make incompatible API changes.
* Increment MINOR when you add functionality in a backwards-compatible manner.
* Increment PATCH when you make backwards-compatible bug fixes.
* MAJOR: incompatible API changes.
* MINOR: backwards-compatible feature additions.
* PATCH: backwards-compatible bug fixes.
🧰 Tools
🪛 LanguageTool

[style] ~115-~115: Three successive sentences begin with the same word. Consider rewording the sentence or use a thesaurus to find a synonym.
Context: ...ty in a backwards-compatible manner. * Increment PATCH when you make backwards-compatibl...

(ENGLISH_WORD_REPEAT_BEGINNING_RULE)

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@docs/branching.md` around lines 111 - 115, The three SemVer rules in the list
starting with MAJOR, MINOR, and PATCH all begin with the same word "Increment,"
creating repetitive sentence structure. Restructure these three bullet points to
vary the phrasing while preserving the meaning. Consider rephrasing at least one
or two of the rules to start with different verbs or sentence structures instead
of beginning each with "Increment" (for example, use passive voice, different
action verbs, or reorganize the grammatical structure) to improve readability
and flow.

Comment thread docs/branching.md Outdated
Comment thread docs/branching.md Outdated
@tisnik tisnik force-pushed the lcore-1642-branching-model branch from 5e676ac to f29e7ce Compare June 15, 2026 08:02
@tisnik tisnik merged commit f1ccb35 into lightspeed-core:main Jun 15, 2026
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant